From 9953d39036bdce274fa5cc81f8be26d91f5ef009 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 25 Feb 2002 17:48:32 +0000 Subject: [PATCH] Fix precendence problem. (Sven Neumann) Mon Feb 25 12:47:25 2002 Owen Taylor * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): Fix precendence problem. (Sven Neumann) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/x11/gdkkeys-x11.c | 2 +- 8 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8ad5e26dae..3297b68135 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Feb 25 12:47:25 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): + Fix precendence problem. (Sven Neumann) + Sun Feb 24 23:23:28 2002 Owen Taylor * tests/testselection.c (main): Convert over to using diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8ad5e26dae..3297b68135 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Mon Feb 25 12:47:25 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): + Fix precendence problem. (Sven Neumann) + Sun Feb 24 23:23:28 2002 Owen Taylor * tests/testselection.c (main): Convert over to using diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8ad5e26dae..3297b68135 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Feb 25 12:47:25 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): + Fix precendence problem. (Sven Neumann) + Sun Feb 24 23:23:28 2002 Owen Taylor * tests/testselection.c (main): Convert over to using diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8ad5e26dae..3297b68135 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Feb 25 12:47:25 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): + Fix precendence problem. (Sven Neumann) + Sun Feb 24 23:23:28 2002 Owen Taylor * tests/testselection.c (main): Convert over to using diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8ad5e26dae..3297b68135 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Feb 25 12:47:25 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): + Fix precendence problem. (Sven Neumann) + Sun Feb 24 23:23:28 2002 Owen Taylor * tests/testselection.c (main): Convert over to using diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8ad5e26dae..3297b68135 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Feb 25 12:47:25 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): + Fix precendence problem. (Sven Neumann) + Sun Feb 24 23:23:28 2002 Owen Taylor * tests/testselection.c (main): Convert over to using diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8ad5e26dae..3297b68135 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Feb 25 12:47:25 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (gdk_keymap_translate_keyboard_state): + Fix precendence problem. (Sven Neumann) + Sun Feb 24 23:23:28 2002 Owen Taylor * tests/testselection.c (main): Convert over to using diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index e6eb7e125c..3d43d61ebf 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -839,7 +839,7 @@ gdk_keymap_translate_keyboard_state (GdkKeymap *keymap, * However, Tab is not _consistently_ GDK_ISO_Left_Tab, so people * can't bind to GDK_ISO_Left_Tab instead. So, we force consistency here. */ - if (tmp_keyval == GDK_Tab && (tmp_modifiers & GDK_SHIFT_MASK == 0)) + if (tmp_keyval == GDK_Tab && (tmp_modifiers & GDK_SHIFT_MASK) == 0) { tmp_keyval = GDK_ISO_Left_Tab; tmp_modifiers |= GDK_SHIFT_MASK; -- 2.30.2